p71924506
/
network-manager-applet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 02:28:45 +08:00
parent 7c0d990c5a
commit 6f85a36256
5 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/patches/Have-the-appindicator-enabled-by-default.patch vendored
View File

@ -6,10 +6,10 @@ Subject: Have the appindicator enabled by default.
src/main.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
Index: network-manager-applet-1.8.24/src/main.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/main.c
+++ network-manager-applet-1.8.24/src/main.c
diff --git a/src/main.c b/src/main.c
index 2308e61..b31c65f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,7 +17,7 @@
gboolean shell_debug = FALSE;

28
debian/patches/Make-policykit-restricted-actions-insensitive.patch vendored
View File

@ -9,11 +9,11 @@ consistently to make the items insensitive
src/applet.c | 30 ++++++++++++++++++++++++++++--
2 files changed, 57 insertions(+), 2 deletions(-)
Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet-device-wifi.c
+++ network-manager-applet-1.8.24/src/applet-device-wifi.c
@@ -203,6 +203,8 @@ nma_menu_add_hidden_network_item (GtkWid
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 37b2121..407f7e0 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -203,6 +203,8 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
{
GtkWidget *menu_item;
GtkWidget *label;
@ -22,7 +22,7 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
menu_item = gtk_menu_item_new ();
label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wi-Fi Network…"));
@@ -213,6 +215,33 @@ nma_menu_add_hidden_network_item (GtkWid
@@ -213,6 +215,33 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
g_signal_connect_swapped (menu_item, "activate",
G_CALLBACK (applet_wifi_connect_to_hidden_network),
applet);
@ -56,10 +56,10 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
}
gboolean
Index: network-manager-applet-1.8.24/src/applet.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.c
+++ network-manager-applet-1.8.24/src/applet.c
diff --git a/src/applet.c b/src/applet.c
index a13808c..7a0f041 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -50,6 +50,8 @@ extern gboolean with_appindicator;
G_DEFINE_TYPE (NMApplet, nma, G_TYPE_APPLICATION)
@ -69,7 +69,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
/********************************************************************/
static gboolean
@@ -1323,7 +1325,10 @@ nma_menu_device_get_menu_item (NMDevice
@@ -1323,7 +1325,10 @@ nma_menu_device_get_menu_item (NMDevice *device,
G_CALLBACK (applet_device_disconnect_db),
info,
applet_device_info_destroy, 0);
@ -81,7 +81,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
break;
}
default:
@@ -1482,7 +1487,8 @@ nma_menu_add_vpn_submenu (GtkWidget *men
@@ -1482,7 +1487,8 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
state = nm_client_get_state (applet->nm_client);
if ( state != NM_STATE_CONNECTED_LOCAL
&& state != NM_STATE_CONNECTED_SITE
@ -91,7 +91,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
else
gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
@@ -1508,6 +1514,12 @@ nma_menu_add_vpn_submenu (GtkWidget *men
@@ -1508,6 +1514,12 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet);
}
gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item));
@ -104,7 +104,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
gtk_widget_show (GTK_WIDGET (item));
g_ptr_array_unref (list);
@@ -1766,6 +1778,20 @@ nma_context_menu_update (NMApplet *apple
@@ -1766,6 +1778,20 @@ nma_context_menu_update (NMApplet *applet)
gtk_widget_show_all (applet->wwan_enabled_item);
else
gtk_widget_hide (applet->wwan_enabled_item);

40
debian/patches/Support-hiding-rather-than-desensitizing-disallowed-items.patch vendored
View File

@ -10,11 +10,11 @@ when nm-applet is started: NM_APPLET_HIDE_POLICY_ITEMS.
src/applet.h | 1 +
3 files changed, 46 insertions(+), 8 deletions(-)
Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet-device-wifi.c
+++ network-manager-applet-1.8.24/src/applet-device-wifi.c
@@ -211,7 +211,6 @@ nma_menu_add_hidden_network_item (GtkWid
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 407f7e0..162b1ff 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -211,7 +211,6 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menu_item), label);
gtk_widget_show_all (menu_item);
@ -22,7 +22,7 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
g_signal_connect_swapped (menu_item, "activate",
G_CALLBACK (applet_wifi_connect_to_hidden_network),
applet);
@@ -242,6 +241,13 @@ nma_menu_add_hidden_network_item (GtkWid
@@ -242,6 +241,13 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet)
}
gtk_widget_set_sensitive (GTK_WIDGET (menu_item), allowed);
@ -36,7 +36,7 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
}
gboolean
@@ -289,13 +295,21 @@ nma_menu_add_create_network_item (GtkWid
@@ -289,13 +295,21 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menu_item), label);
gtk_widget_show_all (menu_item);
@ -60,11 +60,11 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
}
typedef struct {
Index: network-manager-applet-1.8.24/src/applet.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.c
+++ network-manager-applet-1.8.24/src/applet.c
@@ -1459,6 +1459,8 @@ nma_menu_add_vpn_submenu (GtkWidget *men
diff --git a/src/applet.c b/src/applet.c
index 7a0f041..9e41d47 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -1459,6 +1459,8 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
GtkMenuItem *item;
GPtrArray *list;
int i;
@ -73,7 +73,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
vpn_menu = GTK_MENU (gtk_menu_new ());
@@ -1488,9 +1490,16 @@ nma_menu_add_vpn_submenu (GtkWidget *men
@@ -1488,9 +1490,16 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
if ( state != NM_STATE_CONNECTED_LOCAL
&& state != NM_STATE_CONNECTED_SITE
&& state != NM_STATE_CONNECTED_GLOBAL
@ -92,7 +92,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), !!active);
@@ -1506,7 +1515,10 @@ nma_menu_add_vpn_submenu (GtkWidget *men
@@ -1506,7 +1515,10 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
/* Draw a separator, but only if we have VPN connections above it */
if (list->len) {
@ -104,7 +104,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN…")));
g_signal_connect (item, "activate", G_CALLBACK (nma_menu_configure_vpn_item_activate), applet);
} else {
@@ -1514,11 +1526,17 @@ nma_menu_add_vpn_submenu (GtkWidget *men
@@ -1514,11 +1526,17 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet);
}
gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item));
@ -124,7 +124,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
}
gtk_widget_show (GTK_WIDGET (item));
@@ -1791,6 +1809,7 @@ nma_context_menu_update (NMApplet *apple
@@ -1791,6 +1809,7 @@ nma_context_menu_update (NMApplet *applet)
* so set the "Edit Connections..." menu item insensitive.
*/
gtk_widget_set_sensitive (applet->connections_menu_item, FALSE);
@ -143,10 +143,10 @@ Index: network-manager-applet-1.8.24/src/applet.c
}
static void nma_class_init (NMAppletClass *klass)
Index: network-manager-applet-1.8.24/src/applet.h
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.h
+++ network-manager-applet-1.8.24/src/applet.h
diff --git a/src/applet.h b/src/applet.h
index 958ba56..706a2e7 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -76,6 +76,7 @@ typedef struct {
#endif

32
debian/patches/lp341684_device_sensitive_disconnect_notify.patch vendored
View File

@ -8,10 +8,10 @@ Subject: lp341684_device_sensitive_disconnect_notify
src/applet.h | 5 +-
3 files changed, 143 insertions(+), 6 deletions(-)
Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet-device-wifi.c
+++ network-manager-applet-1.8.24/src/applet-device-wifi.c
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 8ce4bd1..37b2121 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -1305,6 +1305,8 @@ wifi_notify_connected (NMDevice *device,
ap = _active_ap_get (applet, device);
@ -21,11 +21,11 @@ Index: network-manager-applet-1.8.24/src/applet-device-wifi.c
esc_ssid = get_ssid_utf8 (ap);
if (!ap)
Index: network-manager-applet-1.8.24/src/applet.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.c
+++ network-manager-applet-1.8.24/src/applet.c
@@ -141,6 +141,19 @@ get_device_class_from_connection (NMConn
diff --git a/src/applet.c b/src/applet.c
index ac4f03d..e43c1e4 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -141,6 +141,19 @@ get_device_class_from_connection (NMConnection *connection, NMApplet *applet)
return NULL;
}
@ -45,7 +45,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
static NMActiveConnection *
applet_get_best_activating_connection (NMApplet *applet, NMDevice **device)
{
@@ -2127,6 +2140,64 @@ applet_get_exported_connection_for_devic
@@ -2127,6 +2140,64 @@ applet_get_exported_connection_for_device (NMDevice *device, NMApplet *applet)
return NULL;
}
@ -110,7 +110,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
static void
applet_common_device_state_changed (NMDevice *device,
NMDeviceState new_state,
@@ -2141,6 +2212,54 @@ applet_common_device_state_changed (NMDe
@@ -2141,6 +2212,54 @@ applet_common_device_state_changed (NMDevice *device,
switch (new_state) {
@ -165,7 +165,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
case NM_DEVICE_STATE_PREPARE:
case NM_DEVICE_STATE_CONFIG:
case NM_DEVICE_STATE_NEED_AUTH:
@@ -2227,13 +2346,26 @@ foo_client_state_changed_cb (NMClient *c
@@ -2227,13 +2346,26 @@ foo_client_state_changed_cb (NMClient *client, GParamSpec *pspec, gpointer user_
{
NMApplet *applet = NM_APPLET (user_data);
@ -197,10 +197,10 @@ Index: network-manager-applet-1.8.24/src/applet.c
default:
break;
}
Index: network-manager-applet-1.8.24/src/applet.h
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.h
+++ network-manager-applet-1.8.24/src/applet.h
diff --git a/src/applet.h b/src/applet.h
index 7a0cb8f..958ba56 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -135,8 +135,11 @@ typedef struct {
/* Tracker objects for secrets requests */

14
debian/patches/lp460144_correctly_update_notification.patch vendored
View File

@ -6,11 +6,11 @@ Subject: lp460144_correctly_update_notification
src/applet.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
Index: network-manager-applet-1.8.24/src/applet.c
===================================================================
--- network-manager-applet-1.8.24.orig/src/applet.c
+++ network-manager-applet-1.8.24/src/applet.c
@@ -673,17 +673,6 @@ applet_menu_item_create_device_item_help
diff --git a/src/applet.c b/src/applet.c
index e43c1e4..a13808c 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -673,17 +673,6 @@ applet_menu_item_create_device_item_helper (NMDevice *device,
return item;
}
@ -65,7 +65,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
#if HAVE_LIBNOTIFY_07
notify_notification_set_hint (notify, "transient", g_variant_new_boolean (TRUE));
@@ -3265,7 +3263,6 @@ status_icon_activate_cb (GtkStatusIcon *
@@ -3265,7 +3263,6 @@ status_icon_activate_cb (GtkStatusIcon *icon, NMApplet *applet)
/* Have clicking on the applet act also as acknowledgement
* of the notification.
*/
@ -73,7 +73,7 @@ Index: network-manager-applet-1.8.24/src/applet.c
applet_start_wifi_scan (applet, NULL);
@@ -3297,7 +3294,6 @@ status_icon_popup_menu_cb (GtkStatusIcon
@@ -3297,7 +3294,6 @@ status_icon_popup_menu_cb (GtkStatusIcon *icon,
/* Have clicking on the applet act also as acknowledgement
* of the notification.
*/