[gnome-panel/wip/segeiger/panel-add-to-dialog] PanelAddtoDialog: Reformat file to indent with spaces instead of tabs
- From: Sebastian Geiger <segeiger src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/segeiger/panel-add-to-dialog] PanelAddtoDialog: Reformat file to indent with spaces instead of tabs
- Date: Fri, 17 Jul 2015 13:13:23 +0000 (UTC)
commit 95b6e7aba1a47c768f237c35e4449840bd6ee511
Author: Sebastian Geiger <sbastig gmx net>
Date: Fri Jul 17 15:12:03 2015 +0200
PanelAddtoDialog: Reformat file to indent with spaces instead of tabs
gnome-panel/panel-addto-dialog.c | 1918 +++++++++++++++++++-------------------
1 files changed, 960 insertions(+), 958 deletions(-)
---
diff --git a/gnome-panel/panel-addto-dialog.c b/gnome-panel/panel-addto-dialog.c
index 56936d9..3535c72 100644
--- a/gnome-panel/panel-addto-dialog.c
+++ b/gnome-panel/panel-addto-dialog.c
@@ -50,33 +50,33 @@
#include "panel-user-menu.h"
struct _PanelAddtoDialog {
- GtkWindow parent;
- PanelWidget *panel_widget;
+ GtkWindow parent;
+ PanelWidget *panel_widget;
- GtkWidget *dialog_vbox;
- GtkWidget *label;
- GtkWidget *search_entry;
- GtkWidget *button_back;
- GtkWidget *button_add;
- GtkWidget *button_close;
- GtkWidget *tree_view;
- GtkWidget *tree_view_selection;
+ GtkWidget *dialog_vbox;
+ GtkWidget *label;
+ GtkWidget *search_entry;
+ GtkWidget *button_back;
+ GtkWidget *button_add;
+ GtkWidget *button_close;
+ GtkWidget *tree_view;
+ GtkWidget *tree_view_selection;
- GtkTreeModel *applet_model;
- GtkTreeModel *filter_applet_model;
- GtkTreeModel *application_model;
- GtkTreeModel *filter_application_model;
+ GtkTreeModel *applet_model;
+ GtkTreeModel *filter_applet_model;
+ GtkTreeModel *application_model;
+ GtkTreeModel *filter_application_model;
- GMenuTree *menu_tree;
+ GMenuTree *menu_tree;
- GSList *applet_list;
- GSList *application_list;
- GSList *settings_list;
+ GSList *applet_list;
+ GSList *application_list;
+ GSList *settings_list;
- gchar *search_text;
- gchar *applet_search_text;
+ gchar *search_text;
+ gchar *applet_search_text;
- PanelObjectPackType insert_pack_type;
+ PanelObjectPackType insert_pack_type;
};
G_DEFINE_TYPE (PanelAddtoDialog, panel_addto_dialog, GTK_TYPE_WINDOW)
@@ -84,758 +84,760 @@ G_DEFINE_TYPE (PanelAddtoDialog, panel_addto_dialog, GTK_TYPE_WINDOW)
static GQuark panel_addto_dialog_quark = 0;
typedef enum {
- PANEL_ADDTO_APPLET,
- PANEL_ADDTO_ACTION,
- PANEL_ADDTO_LAUNCHER_MENU,
- PANEL_ADDTO_LAUNCHER,
- PANEL_ADDTO_LAUNCHER_NEW,
- PANEL_ADDTO_MENU,
- PANEL_ADDTO_MENUBAR,
- PANEL_ADDTO_SEPARATOR,
- PANEL_ADDTO_USER_MENU
+ PANEL_ADDTO_APPLET,
+ PANEL_ADDTO_ACTION,
+ PANEL_ADDTO_LAUNCHER_MENU,
+ PANEL_ADDTO_LAUNCHER,
+ PANEL_ADDTO_LAUNCHER_NEW,
+ PANEL_ADDTO_MENU,
+ PANEL_ADDTO_MENUBAR,
+ PANEL_ADDTO_SEPARATOR,
+ PANEL_ADDTO_USER_MENU
} PanelAddtoItemType;
typedef struct {
- PanelAddtoItemType type;
- char *name;
- char *description;
- GIcon *icon;
- PanelActionButtonType action_type;
- char *launcher_path;
- char *menu_filename;
- char *menu_path;
- char *iid;
- gboolean static_strings;
+ PanelAddtoItemType type;
+ char *name;
+ char *description;
+ GIcon *icon;
+ PanelActionButtonType action_type;
+ char *launcher_path;
+ char *menu_filename;
+ char *menu_path;
+ char *iid;
+ gboolean static_strings;
} PanelAddtoItemInfo;
typedef struct {
- GSList *children;
- PanelAddtoItemInfo item_info;
+ GSList *children;
+ PanelAddtoItemInfo item_info;
} PanelAddtoAppList;
enum {
- COLUMN_ICON,
- COLUMN_TEXT,
- COLUMN_DATA,
- COLUMN_SEARCH,
- NUMBER_COLUMNS
+ COLUMN_ICON,
+ COLUMN_TEXT,
+ COLUMN_DATA,
+ COLUMN_SEARCH,
+ NUMBER_COLUMNS
};
enum {
- PANEL_ADDTO_RESPONSE_BACK,
- PANEL_ADDTO_RESPONSE_ADD
+ PANEL_ADDTO_RESPONSE_BACK,
+ PANEL_ADDTO_RESPONSE_ADD
};
static void panel_addto_present_applications (PanelAddtoDialog *dialog);
-static void panel_addto_present_applets (PanelAddtoDialog *dialog);
+
+static void panel_addto_present_applets (PanelAddtoDialog *dialog);
+
static gboolean panel_addto_filter_func (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data);
+ GtkTreeIter *iter,
+ gpointer data);
static int
panel_addto_applet_info_sort_func (PanelAddtoItemInfo *a,
- PanelAddtoItemInfo *b)
+ PanelAddtoItemInfo *b)
{
- return g_utf8_collate (a->name, b->name);
+ return g_utf8_collate (a->name, b->name);
}
static GSList *
prepend_internal_applets (GSList *list)
{
- PanelAddtoItemInfo *internal;
-
- internal = g_new0 (PanelAddtoItemInfo, 1);
- internal->type = PANEL_ADDTO_MENU;
- internal->name = _("Main Menu");
- internal->description = _("The main GNOME menu");
- internal->icon = g_themed_icon_new (PANEL_ICON_MAIN_MENU);
- internal->action_type = PANEL_ACTION_NONE;
- internal->iid = "MENU:MAIN";
- internal->static_strings = TRUE;
- list = g_slist_prepend (list, internal);
-
- internal = g_new0 (PanelAddtoItemInfo, 1);
- internal->type = PANEL_ADDTO_MENUBAR;
- internal->name = _("Menu Bar");
- internal->description = _("A custom menu bar");
- internal->icon = g_themed_icon_new (PANEL_ICON_MAIN_MENU);
- internal->action_type = PANEL_ACTION_NONE;
- internal->iid = "MENUBAR:NEW";
- internal->static_strings = TRUE;
- list = g_slist_prepend (list, internal);
-
- internal = g_new0 (PanelAddtoItemInfo, 1);
- internal->type = PANEL_ADDTO_SEPARATOR;
- internal->name = _("Separator");
- internal->description = _("A separator to organize the panel items");
- internal->icon = g_themed_icon_new (PANEL_ICON_SEPARATOR);
- internal->action_type = PANEL_ACTION_NONE;
- internal->iid = "SEPARATOR:NEW";
- internal->static_strings = TRUE;
- list = g_slist_prepend (list, internal);
-
- internal = g_new0 (PanelAddtoItemInfo, 1);
- internal->type = PANEL_ADDTO_USER_MENU;
- internal->name = _("User menu");
- internal->description = _("Menu to change your settings and your online status");
- internal->icon = g_themed_icon_new (PANEL_ICON_USER_AVAILABLE);
- internal->action_type = PANEL_ACTION_NONE;
- internal->iid = "USERMENU:NEW";
- internal->static_strings = TRUE;
- list = g_slist_prepend (list, internal);
-
- return list;
+ PanelAddtoItemInfo *internal;
+
+ internal = g_new0 (PanelAddtoItemInfo, 1);
+ internal->type = PANEL_ADDTO_MENU;
+ internal->name = _("Main Menu");
+ internal->description = _("The main GNOME menu");
+ internal->icon = g_themed_icon_new (PANEL_ICON_MAIN_MENU);
+ internal->action_type = PANEL_ACTION_NONE;
+ internal->iid = "MENU:MAIN";
+ internal->static_strings = TRUE;
+ list = g_slist_prepend (list, internal);
+
+ internal = g_new0 (PanelAddtoItemInfo, 1);
+ internal->type = PANEL_ADDTO_MENUBAR;
+ internal->name = _("Menu Bar");
+ internal->description = _("A custom menu bar");
+ internal->icon = g_themed_icon_new (PANEL_ICON_MAIN_MENU);
+ internal->action_type = PANEL_ACTION_NONE;
+ internal->iid = "MENUBAR:NEW";
+ internal->static_strings = TRUE;
+ list = g_slist_prepend (list, internal);
+
+ internal = g_new0 (PanelAddtoItemInfo, 1);
+ internal->type = PANEL_ADDTO_SEPARATOR;
+ internal->name = _("Separator");
+ internal->description = _("A separator to organize the panel items");
+ internal->icon = g_themed_icon_new (PANEL_ICON_SEPARATOR);
+ internal->action_type = PANEL_ACTION_NONE;
+ internal->iid = "SEPARATOR:NEW";
+ internal->static_strings = TRUE;
+ list = g_slist_prepend (list, internal);
+
+ internal = g_new0 (PanelAddtoItemInfo, 1);
+ internal->type = PANEL_ADDTO_USER_MENU;
+ internal->name = _("User menu");
+ internal->description = _("Menu to change your settings and your online status");
+ internal->icon = g_themed_icon_new (PANEL_ICON_USER_AVAILABLE);
+ internal->action_type = PANEL_ACTION_NONE;
+ internal->iid = "USERMENU:NEW";
+ internal->static_strings = TRUE;
+ list = g_slist_prepend (list, internal);
+
+ return list;
}
static GSList *
panel_addto_prepend_internal_applets (GSList *list)
{
- int i;
+ int i;
- list = prepend_internal_applets (list);
+ list = prepend_internal_applets (list);
- for (i = PANEL_ACTION_LOCK; i < PANEL_ACTION_LAST; i++) {
- PanelAddtoItemInfo *info;
+ for (i = PANEL_ACTION_LOCK; i < PANEL_ACTION_LAST; i++) {
+ PanelAddtoItemInfo *info;
- if (i == PANEL_ACTION_REBOOT || i == PANEL_ACTION_HYBRID_SLEEP
- || i == PANEL_ACTION_SUSPEND || i == PANEL_ACTION_HIBERNATE)
- continue;
+ if (i == PANEL_ACTION_REBOOT || i == PANEL_ACTION_HYBRID_SLEEP
+ || i == PANEL_ACTION_SUSPEND || i == PANEL_ACTION_HIBERNATE)
+ continue;
- if (panel_action_get_is_disabled (i))
- continue;
+ if (panel_action_get_is_disabled (i))
+ continue;
- info = g_new0 (PanelAddtoItemInfo, 1);
- info->type = PANEL_ADDTO_ACTION;
- info->action_type = i;
- info->name = (char *) panel_action_get_text (i);
- info->description = (char *) panel_action_get_tooltip (i);
- if (panel_action_get_icon_name (i) != NULL)
- info->icon = g_themed_icon_new (panel_action_get_icon_name (i));
- info->iid = (char *) panel_action_get_drag_id (i);
- info->static_strings = TRUE;
+ info = g_new0 (PanelAddtoItemInfo, 1);
+ info->type = PANEL_ADDTO_ACTION;
+ info->action_type = i;
+ info->name = (char *) panel_action_get_text (i);
+ info->description = (char *) panel_action_get_tooltip (i);
+ if (panel_action_get_icon_name (i) != NULL)
+ info->icon = g_themed_icon_new (panel_action_get_icon_name (i));
+ info->iid = (char *) panel_action_get_drag_id (i);
+ info->static_strings = TRUE;
- list = g_slist_prepend (list, info);
- }
+ list = g_slist_prepend (list, info);
+ }
- return list;
+ return list;
}
static char *
panel_addto_make_text (const char *name,
- const char *desc)
+ const char *desc)
{
- const char *real_name;
- char *result;
+ const char *real_name;
+ char *result;
- real_name = name ? name : _("(empty)");
+ real_name = name ? name : _("(empty)");
- if (!PANEL_GLIB_STR_EMPTY (desc)) {
- result = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>\n%s",
- real_name, desc);
- } else {
- result = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
- real_name);
- }
+ if (!PANEL_GLIB_STR_EMPTY (desc)) {
+ result = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>\n%s",
+ real_name, desc);
+ } else {
+ result = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
+ real_name);
+ }
- return result;
+ return result;
}
-static void
-panel_addto_drag_data_get_cb (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
- const char *string)
+static void
+panel_addto_drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ const char *string)
{
- gtk_selection_data_set (selection_data,
- gtk_selection_data_get_target (selection_data), 8,
- (guchar *) string, strlen (string));
+ gtk_selection_data_set (selection_data,
+ gtk_selection_data_get_target (selection_data), 8,
+ (guchar *) string, strlen (string));
}
static void
-panel_addto_drag_begin_cb (GtkWidget *widget,
- GdkDragContext *context,
- gpointer data)
+panel_addto_drag_begin_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gpointer data)
{
- GtkTreeModel *filter_model;
- GtkTreeModel *child_model;
- GtkTreePath *path;
- GtkTreeIter iter;
- GtkTreeIter filter_iter;
- GIcon *gicon;
-
- filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
- gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL);
- gtk_tree_model_get_iter (filter_model, &filter_iter, path);
- gtk_tree_path_free (path);
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
- &iter, &filter_iter);
-
- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
- gtk_tree_model_get (child_model, &iter,
- COLUMN_ICON, &gicon,
- -1);
-
- gtk_drag_set_icon_gicon (context, gicon, 0, 0);
- g_object_unref (gicon);
+ GtkTreeModel *filter_model;
+ GtkTreeModel *child_model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkTreeIter filter_iter;
+ GIcon *gicon;
+
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
+
+ gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL);
+ gtk_tree_model_get_iter (filter_model, &filter_iter, path);
+ gtk_tree_path_free (path);
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
+ &iter, &filter_iter);
+
+ child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ gtk_tree_model_get (child_model, &iter,
+ COLUMN_ICON, &gicon,
+ -1);
+
+ gtk_drag_set_icon_gicon (context, gicon, 0, 0);
+ g_object_unref (gicon);
}
static void
-panel_addto_setup_drag (GtkTreeView *tree_view,
- const GtkTargetEntry *target,
- const char *text)
+panel_addto_setup_drag (GtkTreeView *tree_view,
+ const GtkTargetEntry *target,
+ const char *text)
{
- if (!text || panel_lockdown_get_panels_locked_down_s ())
- return;
-
- gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view),
- GDK_BUTTON1_MASK|GDK_BUTTON2_MASK,
- target, 1, GDK_ACTION_COPY);
-
- g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get",
- G_CALLBACK (panel_addto_drag_data_get_cb),
- g_strdup (text),
- (GClosureNotify) g_free,
- 0 /* connect_flags */);
- g_signal_connect_after (G_OBJECT (tree_view), "drag-begin",
- G_CALLBACK (panel_addto_drag_begin_cb),
- NULL);
+ if (!text || panel_lockdown_get_panels_locked_down_s ())
+ return;
+
+ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view),
+ GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ target, 1, GDK_ACTION_COPY);
+
+ g_signal_connect_data (G_OBJECT (tree_view), "drag_data_get",
+ G_CALLBACK (panel_addto_drag_data_get_cb),
+ g_strdup (text),
+ (GClosureNotify) g_free,
+ 0 /* connect_flags */);
+ g_signal_connect_after (G_OBJECT (tree_view), "drag-begin",
+ G_CALLBACK (panel_addto_drag_begin_cb),
+ NULL);
}
static void
panel_addto_setup_launcher_drag (GtkTreeView *tree_view,
- const char *path)
+ const char *path)
{
- static GtkTargetEntry target[] = {
- { "text/uri-list", 0, 0 }
- };
- char *uri;
- char *uri_list;
-
- uri = g_filename_to_uri (path, NULL, NULL);
- uri_list = g_strconcat (uri, "\r\n", NULL);
- panel_addto_setup_drag (tree_view, target, uri_list);
- g_free (uri_list);
- g_free (uri);
+ static GtkTargetEntry target[] = {
+ {"text/uri-list", 0, 0}
+ };
+ char *uri;
+ char *uri_list;
+
+ uri = g_filename_to_uri (path, NULL, NULL);
+ uri_list = g_strconcat (uri, "\r\n", NULL);
+ panel_addto_setup_drag (tree_view, target, uri_list);
+ g_free (uri_list);
+ g_free (uri);
}
static void
panel_addto_setup_applet_drag (GtkTreeView *tree_view,
- const char *iid)
+ const char *iid)
{
- static GtkTargetEntry target[] = {
- { "application/x-panel-applet-iid", 0, 0 }
- };
+ static GtkTargetEntry target[] = {
+ {"application/x-panel-applet-iid", 0, 0}
+ };
- panel_addto_setup_drag (tree_view, target, iid);
+ panel_addto_setup_drag (tree_view, target, iid);
}
static void
panel_addto_setup_internal_applet_drag (GtkTreeView *tree_view,
- const char *applet_type)
+ const char *applet_type)
{
- static GtkTargetEntry target[] = {
- { "application/x-panel-applet-internal", 0, 0 }
- };
+ static GtkTargetEntry target[] = {
+ {"application/x-panel-applet-internal", 0, 0}
+ };
- panel_addto_setup_drag (tree_view, target, applet_type);
+ panel_addto_setup_drag (tree_view, target, applet_type);
}
static GSList *
panel_addto_query_applets (GSList *list)
{
- GList *applet_list, *l;
+ GList *applet_list, *l;
- applet_list = panel_applets_manager_get_applets ();
+ applet_list = panel_applets_manager_get_applets ();
- for (l = applet_list; l; l = g_list_next (l)) {
- PanelAppletInfo *info;
- const char *iid, *name, *description, *icon;
- PanelAddtoItemInfo *applet;
+ for (l = applet_list; l; l = g_list_next (l)) {
+ PanelAppletInfo *info;
+ const char *iid, *name, *description, *icon;
+ PanelAddtoItemInfo *applet;
- info = (PanelAppletInfo *)l->data;
+ info = (PanelAppletInfo *) l->data;
- iid = panel_applet_info_get_iid (info);
- name = panel_applet_info_get_name (info);
- description = panel_applet_info_get_description (info);
- icon = panel_applet_info_get_icon (info);
+ iid = panel_applet_info_get_iid (info);
+ name = panel_applet_info_get_name (info);
+ description = panel_applet_info_get_description (info);
+ icon = panel_applet_info_get_icon (info);
- if (!name ||
- panel_lockdown_is_applet_disabled (panel_lockdown_get (),
- iid)) {
- continue;
- }
+ if (!name ||
+ panel_lockdown_is_applet_disabled (panel_lockdown_get (),
+ iid)) {
+ continue;
+ }
- applet = g_new0 (PanelAddtoItemInfo, 1);
- applet->type = PANEL_ADDTO_APPLET;
- applet->name = g_strdup (name);
- applet->description = g_strdup (description);
- if (icon)
- applet->icon = g_themed_icon_new (icon);
- applet->iid = g_strdup (iid);
- applet->static_strings = FALSE;
+ applet = g_new0 (PanelAddtoItemInfo, 1);
+ applet->type = PANEL_ADDTO_APPLET;
+ applet->name = g_strdup (name);
+ applet->description = g_strdup (description);
+ if (icon)
+ applet->icon = g_themed_icon_new (icon);
+ applet->iid = g_strdup (iid);
+ applet->static_strings = FALSE;
- list = g_slist_prepend (list, applet);
- }
+ list = g_slist_prepend (list, applet);
+ }
- g_list_free (applet_list);
+ g_list_free (applet_list);
- return list;
+ return list;
}
static void
panel_addto_append_item (PanelAddtoDialog *dialog,
- GtkListStore *model,
- PanelAddtoItemInfo *applet)
+ GtkListStore *model,
+ PanelAddtoItemInfo *applet)
{
- char *text;
- GtkTreeIter iter;
-
- if (applet == NULL) {
- gtk_list_store_append (model, &iter);
- gtk_list_store_set (model, &iter,
- COLUMN_ICON, NULL,
- COLUMN_TEXT, NULL,
- COLUMN_DATA, NULL,
- COLUMN_SEARCH, NULL,
- -1);
- } else {
- gtk_list_store_append (model, &iter);
-
- text = panel_addto_make_text (applet->name,
- applet->description);
-
- gtk_list_store_set (model, &iter,
- COLUMN_ICON, applet->icon,
- COLUMN_TEXT, text,
- COLUMN_DATA, applet,
- COLUMN_SEARCH, applet->name,
- -1);
-
- g_free (text);
- }
+ char *text;
+ GtkTreeIter iter;
+
+ if (applet == NULL) {
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter,
+ COLUMN_ICON, NULL,
+ COLUMN_TEXT, NULL,
+ COLUMN_DATA, NULL,
+ COLUMN_SEARCH, NULL,
+ -1);
+ } else {
+ gtk_list_store_append (model, &iter);
+
+ text = panel_addto_make_text (applet->name,
+ applet->description);
+
+ gtk_list_store_set (model, &iter,
+ COLUMN_ICON, applet->icon,
+ COLUMN_TEXT, text,
+ COLUMN_DATA, applet,
+ COLUMN_SEARCH, applet->name,
+ -1);
+
+ g_free (text);
+ }
}
static void
panel_addto_append_special_applets (PanelAddtoDialog *dialog,
- GtkListStore *model)
+ GtkListStore *model)
{
- PanelAddtoItemInfo *special;
-
- if (!panel_lockdown_get_disable_command_line_s ()) {
- special = g_new0 (PanelAddtoItemInfo, 1);
- special->type = PANEL_ADDTO_LAUNCHER_NEW;
- special->name = _("Custom Application Launcher");
- special->description = _("Create a new launcher");
- special->icon = g_themed_icon_new (PANEL_ICON_LAUNCHER);
- special->action_type = PANEL_ACTION_NONE;
- special->iid = "LAUNCHER:ASK";
- special->static_strings = TRUE;
- panel_addto_append_item (dialog, model, special);
- }
-
- special = g_new0 (PanelAddtoItemInfo, 1);
- special->type = PANEL_ADDTO_LAUNCHER_MENU;
- special->name = _("Application Launcher...");
- special->description = _("Copy a launcher from the applications menu");
- special->icon = g_themed_icon_new (PANEL_ICON_LAUNCHER);
- special->action_type = PANEL_ACTION_NONE;
- special->iid = "LAUNCHER:MENU";
- special->static_strings = TRUE;
- panel_addto_append_item (dialog, model, special);
+ PanelAddtoItemInfo *special;
+
+ if (!panel_lockdown_get_disable_command_line_s ()) {
+ special = g_new0 (PanelAddtoItemInfo, 1);
+ special->type = PANEL_ADDTO_LAUNCHER_NEW;
+ special->name = _("Custom Application Launcher");
+ special->description = _("Create a new launcher");
+ special->icon = g_themed_icon_new (PANEL_ICON_LAUNCHER);
+ special->action_type = PANEL_ACTION_NONE;
+ special->iid = "LAUNCHER:ASK";
+ special->static_strings = TRUE;
+ panel_addto_append_item (dialog, model, special);
+ }
+
+ special = g_new0 (PanelAddtoItemInfo, 1);
+ special->type = PANEL_ADDTO_LAUNCHER_MENU;
+ special->name = _("Application Launcher...");
+ special->description = _("Copy a launcher from the applications menu");
+ special->icon = g_themed_icon_new (PANEL_ICON_LAUNCHER);
+ special->action_type = PANEL_ACTION_NONE;
+ special->iid = "LAUNCHER:MENU";
+ special->static_strings = TRUE;
+ panel_addto_append_item (dialog, model, special);
}
static void
panel_addto_make_applet_model (PanelAddtoDialog *dialog)
{
- GtkListStore *model;
- GSList *l;
-
- if (dialog->filter_applet_model != NULL)
- return;
-
- if (panel_layout_is_writable ()) {
- dialog->applet_list = panel_addto_query_applets (dialog->applet_list);
- dialog->applet_list = panel_addto_prepend_internal_applets (dialog->applet_list);
- }
-
- dialog->applet_list = g_slist_sort (dialog->applet_list,
- (GCompareFunc) panel_addto_applet_info_sort_func);
-
- model = gtk_list_store_new (NUMBER_COLUMNS,
- G_TYPE_ICON,
- G_TYPE_STRING,
- G_TYPE_POINTER,
- G_TYPE_STRING);
-
- if (panel_layout_is_writable ()) {
- panel_addto_append_special_applets (dialog, model);
- if (dialog->applet_list)
- panel_addto_append_item (dialog, model, NULL);
- }
-
- for (l = dialog->applet_list; l; l = l->next)
- panel_addto_append_item (dialog, model, l->data);
-
- dialog->applet_model = GTK_TREE_MODEL (model);
- dialog->filter_applet_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->applet_model),
- NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_applet_model),
- panel_addto_filter_func,
- dialog, NULL);
+ GtkListStore *model;
+ GSList *l;
+
+ if (dialog->filter_applet_model != NULL)
+ return;
+
+ if (panel_layout_is_writable ()) {
+ dialog->applet_list = panel_addto_query_applets (dialog->applet_list);
+ dialog->applet_list = panel_addto_prepend_internal_applets (dialog->applet_list);
+ }
+
+ dialog->applet_list = g_slist_sort (dialog->applet_list,
+ (GCompareFunc) panel_addto_applet_info_sort_func);
+
+ model = gtk_list_store_new (NUMBER_COLUMNS,
+ G_TYPE_ICON,
+ G_TYPE_STRING,
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
+
+ if (panel_layout_is_writable ()) {
+ panel_addto_append_special_applets (dialog, model);
+ if (dialog->applet_list)
+ panel_addto_append_item (dialog, model, NULL);
+ }
+
+ for (l = dialog->applet_list; l; l = l->next)
+ panel_addto_append_item (dialog, model, l->data);
+
+ dialog->applet_model = GTK_TREE_MODEL (model);
+ dialog->filter_applet_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->applet_model),
+ NULL);
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_applet_model),
+ panel_addto_filter_func,
+ dialog, NULL);
}
typedef enum {
- PANEL_ADDTO_MENU_SHOW_DIRECTORIES = 1 << 0,
- PANEL_ADDTO_MENU_SHOW_ENTRIES = 1 << 1,
- PANEL_ADDTO_MENU_SHOW_ALIAS = 1 << 2
+ PANEL_ADDTO_MENU_SHOW_DIRECTORIES = 1 << 0,
+ PANEL_ADDTO_MENU_SHOW_ENTRIES = 1 << 1,
+ PANEL_ADDTO_MENU_SHOW_ALIAS = 1 << 2
#define PANEL_ADDTO_MENU_SHOW_ALL (PANEL_ADDTO_MENU_SHOW_DIRECTORIES | PANEL_ADDTO_MENU_SHOW_ENTRIES |
PANEL_ADDTO_MENU_SHOW_ALIAS)
} PanelAddtoMenuShowFlags;
-static void panel_addto_make_application_list (GSList **parent_list,
- GMenuTreeDirectory *directory,
- const char *filename,
- PanelAddtoMenuShowFlags show_flags);
+static void panel_addto_make_application_list (GSList **parent_list,
+ GMenuTreeDirectory *directory,
+ const char *filename,
+ PanelAddtoMenuShowFlags show_flags);
static void
-panel_addto_prepend_directory (GSList **parent_list,
- GMenuTreeDirectory *directory,
- const char *filename)
+panel_addto_prepend_directory (GSList **parent_list,
+ GMenuTreeDirectory *directory,
+ const char *filename)
{
- PanelAddtoAppList *data;
- GIcon *icon;
-
- data = g_new0 (PanelAddtoAppList, 1);
-
- icon = gmenu_tree_directory_get_icon (directory);
- if (icon)
- g_object_ref (icon);
-
- data->item_info.type = PANEL_ADDTO_MENU;
- data->item_info.name = g_strdup (gmenu_tree_directory_get_name (directory));
- data->item_info.description = g_strdup (gmenu_tree_directory_get_comment (directory));
- data->item_info.icon = icon;
- data->item_info.menu_filename = g_strdup (filename);
- data->item_info.menu_path = gmenu_tree_directory_make_path (directory, NULL);
- data->item_info.static_strings = FALSE;
-
- /* We should set the iid here to something and do
- * iid = g_strdup_printf ("MENU:%s", tfr->name)
- * but this means we'd have to free the iid later
- * and this would complexify too much the free
- * function.
- * So the iid is built when we select the row.
- */
-
- *parent_list = g_slist_prepend (*parent_list, data);
-
- /* We always want to show everything in non-root directories */
- panel_addto_make_application_list (&data->children, directory,
- filename, PANEL_ADDTO_MENU_SHOW_ALL);
+ PanelAddtoAppList *data;
+ GIcon *icon;
+
+ data = g_new0 (PanelAddtoAppList, 1);
+
+ icon = gmenu_tree_directory_get_icon (directory);
+ if (icon)
+ g_object_ref (icon);
+
+ data->item_info.type = PANEL_ADDTO_MENU;
+ data->item_info.name = g_strdup (gmenu_tree_directory_get_name (directory));
+ data->item_info.description = g_strdup (gmenu_tree_directory_get_comment (directory));
+ data->item_info.icon = icon;
+ data->item_info.menu_filename = g_strdup (filename);
+ data->item_info.menu_path = gmenu_tree_directory_make_path (directory, NULL);
+ data->item_info.static_strings = FALSE;
+
+ /* We should set the iid here to something and do
+ * iid = g_strdup_printf ("MENU:%s", tfr->name)
+ * but this means we'd have to free the iid later
+ * and this would complexify too much the free
+ * function.
+ * So the iid is built when we select the row.
+ */
+
+ *parent_list = g_slist_prepend (*parent_list, data);
+
+ /* We always want to show everything in non-root directories */
+ panel_addto_make_application_list (&data->children, directory,
+ filename, PANEL_ADDTO_MENU_SHOW_ALL);
}
static void
-panel_addto_prepend_entry (GSList **parent_list,
- GMenuTreeEntry *entry,
- const char *filename)
+panel_addto_prepend_entry (GSList **parent_list,
+ GMenuTreeEntry *entry,
+ const char *filename)
{
- PanelAddtoAppList *data;
- GAppInfo *app_info;
- GIcon *icon;
+ PanelAddtoAppList *data;
+ GAppInfo *app_info;
+ GIcon *icon;
- data = g_new0 (PanelAddtoAppList, 1);
+ data = g_new0 (PanelAddtoAppList, 1);
- app_info = G_APP_INFO (gmenu_tree_entry_get_app_info (entry));
+ app_info = G_APP_INFO (gmenu_tree_entry_get_app_info (entry));
- icon = g_app_info_get_icon (app_info);
- if (icon)
- g_object_ref (icon);
+ icon = g_app_info_get_icon (app_info);
+ if (icon)
+ g_object_ref (icon);
- data->item_info.type = PANEL_ADDTO_LAUNCHER;
- data->item_info.name = g_strdup (g_app_info_get_display_name (app_info));
- data->item_info.description = g_strdup (g_app_info_get_description (app_info));
- data->item_info.icon = icon;
- data->item_info.launcher_path = g_strdup (gmenu_tree_entry_get_desktop_file_path (entry));
- data->item_info.static_strings = FALSE;
+ data->item_info.type = PANEL_ADDTO_LAUNCHER;
+ data->item_info.name = g_strdup (g_app_info_get_display_name (app_info));
+ data->item_info.description = g_strdup (g_app_info_get_description (app_info));
+ data->item_info.icon = icon;
+ data->item_info.launcher_path = g_strdup (gmenu_tree_entry_get_desktop_file_path (entry));
+ data->item_info.static_strings = FALSE;
- *parent_list = g_slist_prepend (*parent_list, data);
+ *parent_list = g_slist_prepend (*parent_list, data);
}
static void
-panel_addto_prepend_alias (GSList **parent_list,
- GMenuTreeAlias *alias,
- const char *filename)
+panel_addto_prepend_alias (GSList **parent_list,
+ GMenuTreeAlias *alias,
+ const char *filename)
{
- switch (gmenu_tree_alias_get_aliased_item_type (alias)) {
- case GMENU_TREE_ITEM_DIRECTORY: {
- GMenuTreeDirectory *directory = gmenu_tree_alias_get_aliased_directory (alias);
- panel_addto_prepend_directory (parent_list,
- directory,
- filename);
- gmenu_tree_item_unref (directory);
- break;
- }
- case GMENU_TREE_ITEM_ENTRY: {
- GMenuTreeEntry *entry = gmenu_tree_alias_get_aliased_entry (alias);
- panel_addto_prepend_entry (parent_list,
- entry,
- filename);
- gmenu_tree_item_unref (entry);
- break;
- }
- default:
- break;
- }
+ switch (gmenu_tree_alias_get_aliased_item_type (alias)) {
+ case GMENU_TREE_ITEM_DIRECTORY: {
+ GMenuTreeDirectory *directory = gmenu_tree_alias_get_aliased_directory (alias);
+ panel_addto_prepend_directory (parent_list,
+ directory,
+ filename);
+ gmenu_tree_item_unref (directory);
+ break;
+ }
+ case GMENU_TREE_ITEM_ENTRY: {
+ GMenuTreeEntry *entry = gmenu_tree_alias_get_aliased_entry (alias);
+ panel_addto_prepend_entry (parent_list,
+ entry,
+ filename);
+ gmenu_tree_item_unref (entry);
+ break;
+ }
+ default:
+ break;
+ }
}
static void
-panel_addto_make_application_list (GSList **parent_list,
- GMenuTreeDirectory *directory,
- const char *filename,
- PanelAddtoMenuShowFlags show_flags)
+panel_addto_make_application_list (GSList **parent_list,
+ GMenuTreeDirectory *directory,
+ const char *filename,
+ PanelAddtoMenuShowFlags show_flags)
{
- GMenuTreeIter *iter;
- GMenuTreeItemType next_type;
-
- iter = gmenu_tree_directory_iter (directory);
-
- while ((next_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID) {
- switch (next_type) {
- case GMENU_TREE_ITEM_DIRECTORY:
- if (show_flags & PANEL_ADDTO_MENU_SHOW_DIRECTORIES) {
- GMenuTreeDirectory *dir = gmenu_tree_iter_get_directory (iter);
- panel_addto_prepend_directory (parent_list, dir, filename);
- gmenu_tree_item_unref (dir);
- }
- break;
-
- case GMENU_TREE_ITEM_ENTRY:
- if (show_flags & PANEL_ADDTO_MENU_SHOW_ENTRIES) {
- GMenuTreeEntry *entry = gmenu_tree_iter_get_entry (iter);
- panel_addto_prepend_entry (parent_list, entry, filename);
- gmenu_tree_item_unref (entry);
- }
- break;
-
- case GMENU_TREE_ITEM_ALIAS:
- if (show_flags & PANEL_ADDTO_MENU_SHOW_ALIAS) {
- GMenuTreeAlias *alias = gmenu_tree_iter_get_alias (iter);
- panel_addto_prepend_alias (parent_list, alias, filename);
- gmenu_tree_item_unref (alias);
- }
- break;
-
- default:
- break;
- }
- }
- gmenu_tree_iter_unref (iter);
-
- *parent_list = g_slist_reverse (*parent_list);
+ GMenuTreeIter *iter;
+ GMenuTreeItemType next_type;
+
+ iter = gmenu_tree_directory_iter (directory);
+
+ while ((next_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID) {
+ switch (next_type) {
+ case GMENU_TREE_ITEM_DIRECTORY:
+ if (show_flags & PANEL_ADDTO_MENU_SHOW_DIRECTORIES) {
+ GMenuTreeDirectory *dir = gmenu_tree_iter_get_directory (iter);
+ panel_addto_prepend_directory (parent_list, dir, filename);
+ gmenu_tree_item_unref (dir);
+ }
+ break;
+
+ case GMENU_TREE_ITEM_ENTRY:
+ if (show_flags & PANEL_ADDTO_MENU_SHOW_ENTRIES) {
+ GMenuTreeEntry *entry = gmenu_tree_iter_get_entry (iter);
+ panel_addto_prepend_entry (parent_list, entry, filename);
+ gmenu_tree_item_unref (entry);
+ }
+ break;
+
+ case GMENU_TREE_ITEM_ALIAS:
+ if (show_flags & PANEL_ADDTO_MENU_SHOW_ALIAS) {
+ GMenuTreeAlias *alias = gmenu_tree_iter_get_alias (iter);
+ panel_addto_prepend_alias (parent_list, alias, filename);
+ gmenu_tree_item_unref (alias);
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+ gmenu_tree_iter_unref (iter);
+
+ *parent_list = g_slist_reverse (*parent_list);
}
static void
panel_addto_populate_application_model (GtkTreeStore *store,
- GtkTreeIter *parent,
- GSList *app_list)
+ GtkTreeIter *parent,
+ GSList *app_list)
{
- PanelAddtoAppList *data;
- GtkTreeIter iter;
- char *text;
- GSList *app;
-
- for (app = app_list; app != NULL; app = app->next) {
- data = app->data;
- gtk_tree_store_append (store, &iter, parent);
-
- text = panel_addto_make_text (data->item_info.name,
- data->item_info.description);
- gtk_tree_store_set (store, &iter,
- COLUMN_ICON, data->item_info.icon,
- COLUMN_TEXT, text,
- COLUMN_DATA, &(data->item_info),
- COLUMN_SEARCH, data->item_info.name,
- -1);
-
- g_free (text);
-
- if (data->children != NULL)
- panel_addto_populate_application_model (store,
- &iter,
- data->children);
- }
+ PanelAddtoAppList *data;
+ GtkTreeIter iter;
+ char *text;
+ GSList *app;
+
+ for (app = app_list; app != NULL; app = app->next) {
+ data = app->data;
+ gtk_tree_store_append (store, &iter, parent);
+
+ text = panel_addto_make_text (data->item_info.name,
+ data->item_info.description);
+ gtk_tree_store_set (store, &iter,
+ COLUMN_ICON, data->item_info.icon,
+ COLUMN_TEXT, text,
+ COLUMN_DATA, &(data->item_info),
+ COLUMN_SEARCH, data->item_info.name,
+ -1);
+
+ g_free (text);
+
+ if (data->children != NULL)
+ panel_addto_populate_application_model (store,
+ &iter,
+ data->children);
+ }
}
static void
panel_addto_make_application_model (PanelAddtoDialog *dialog)
{
- GtkTreeStore *store;
- GMenuTree *tree;
- GMenuTreeDirectory *root;
- gchar *applications_menu;
-
- if (dialog->filter_application_model != NULL)
- return;
-
- store = gtk_tree_store_new (NUMBER_COLUMNS,
- G_TYPE_ICON,
- G_TYPE_STRING,
- G_TYPE_POINTER,
- G_TYPE_STRING);
-
- applications_menu = get_applications_menu ();
- tree = gmenu_tree_new (applications_menu, GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL)) {
- g_object_unref (tree);
- tree = NULL;
- }
-
- if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
- panel_addto_make_application_list (&dialog->application_list,
- root, applications_menu,
- PANEL_ADDTO_MENU_SHOW_ALL);
- panel_addto_populate_application_model (store, NULL, dialog->application_list);
-
- gmenu_tree_item_unref (root);
- }
-
- g_free (applications_menu);
-
- if (tree != NULL)
- g_object_unref (tree);
-
- tree = gmenu_tree_new ("gnomecc.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL)) {
- g_object_unref (tree);
- tree = NULL;
- }
-
- if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
- GtkTreeIter iter;
-
- gtk_tree_store_append (store, &iter, NULL);
- gtk_tree_store_set (store, &iter,
- COLUMN_ICON, NULL,
- COLUMN_TEXT, NULL,
- COLUMN_DATA, NULL,
- COLUMN_SEARCH, NULL,
- -1);
-
- /* The gnome-control-center shell does not display toplevel
- * entries that are not directories, so do the same. */
- panel_addto_make_application_list (&dialog->settings_list,
- root, "gnomecc.menu",
- PANEL_ADDTO_MENU_SHOW_DIRECTORIES);
- panel_addto_populate_application_model (store, NULL,
- dialog->settings_list);
-
- gmenu_tree_item_unref (root);
- }
-
- if (tree != NULL)
- g_object_unref (tree);
-
- dialog->application_model = GTK_TREE_MODEL (store);
- dialog->filter_application_model = gtk_tree_model_filter_new (GTK_TREE_MODEL
(dialog->application_model),
- NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_application_model),
- panel_addto_filter_func,
- dialog, NULL);
+ GtkTreeStore *store;
+ GMenuTree *tree;
+ GMenuTreeDirectory *root;
+ gchar *applications_menu;
+
+ if (dialog->filter_application_model != NULL)
+ return;
+
+ store = gtk_tree_store_new (NUMBER_COLUMNS,
+ G_TYPE_ICON,
+ G_TYPE_STRING,
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
+
+ applications_menu = get_applications_menu ();
+ tree = gmenu_tree_new (applications_menu, GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+
+ if (!gmenu_tree_load_sync (tree, NULL)) {
+ g_object_unref (tree);
+ tree = NULL;
+ }
+
+ if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
+ panel_addto_make_application_list (&dialog->application_list,
+ root, applications_menu,
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
+
+ gmenu_tree_item_unref (root);
+ }
+
+ g_free (applications_menu);
+
+ if (tree != NULL)
+ g_object_unref (tree);
+
+ tree = gmenu_tree_new ("gnomecc.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+
+ if (!gmenu_tree_load_sync (tree, NULL)) {
+ g_object_unref (tree);
+ tree = NULL;
+ }
+
+ if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
+ GtkTreeIter iter;
+
+ gtk_tree_store_append (store, &iter, NULL);
+ gtk_tree_store_set (store, &iter,
+ COLUMN_ICON, NULL,
+ COLUMN_TEXT, NULL,
+ COLUMN_DATA, NULL,
+ COLUMN_SEARCH, NULL,
+ -1);
+
+ /* The gnome-control-center shell does not display toplevel
+ * entries that are not directories, so do the same. */
+ panel_addto_make_application_list (&dialog->settings_list,
+ root, "gnomecc.menu",
+ PANEL_ADDTO_MENU_SHOW_DIRECTORIES);
+ panel_addto_populate_application_model (store, NULL,
+ dialog->settings_list);
+
+ gmenu_tree_item_unref (root);
+ }
+
+ if (tree != NULL)
+ g_object_unref (tree);
+
+ dialog->application_model = GTK_TREE_MODEL (store);
+ dialog->filter_application_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->application_model),
+ NULL);
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (dialog->filter_application_model),
+ panel_addto_filter_func,
+ dialog, NULL);
}
static void
-panel_addto_add_item (PanelAddtoDialog *dialog,
- PanelAddtoItemInfo *item_info)
+panel_addto_add_item (PanelAddtoDialog *dialog,
+ PanelAddtoItemInfo *item_info)
{
- int pack_index;
-
- g_assert (item_info != NULL);
-
- pack_index = panel_widget_get_new_pack_index (dialog->panel_widget,
- dialog->insert_pack_type);
-
- switch (item_info->type) {
- case PANEL_ADDTO_APPLET:
- panel_applet_frame_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index,
- item_info->iid);
- break;
- case PANEL_ADDTO_ACTION:
- panel_action_button_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index,
- item_info->action_type);
- break;
- case PANEL_ADDTO_LAUNCHER_MENU:
- panel_addto_present_applications (dialog);
- break;
- case PANEL_ADDTO_LAUNCHER:
- panel_launcher_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index,
- item_info->launcher_path);
- break;
- case PANEL_ADDTO_LAUNCHER_NEW:
- ask_about_launcher (NULL, dialog->panel_widget,
- dialog->insert_pack_type);
- break;
- case PANEL_ADDTO_MENU:
- panel_menu_button_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index,
- item_info->menu_filename,
- item_info->menu_path,
- item_info->name);
- break;
- case PANEL_ADDTO_MENUBAR:
- panel_menu_bar_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index);
- break;
- case PANEL_ADDTO_SEPARATOR:
- panel_separator_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index);
- break;
- case PANEL_ADDTO_USER_MENU:
- panel_user_menu_create (dialog->panel_widget->toplevel,
- dialog->insert_pack_type,
- pack_index);
- break;
- }
+ int pack_index;
+
+ g_assert (item_info != NULL);
+
+ pack_index = panel_widget_get_new_pack_index (dialog->panel_widget,
+ dialog->insert_pack_type);
+
+ switch (item_info->type) {
+ case PANEL_ADDTO_APPLET:
+ panel_applet_frame_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index,
+ item_info->iid);
+ break;
+ case PANEL_ADDTO_ACTION:
+ panel_action_button_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index,
+ item_info->action_type);
+ break;
+ case PANEL_ADDTO_LAUNCHER_MENU:
+ panel_addto_present_applications (dialog);
+ break;
+ case PANEL_ADDTO_LAUNCHER:
+ panel_launcher_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index,
+ item_info->launcher_path);
+ break;
+ case PANEL_ADDTO_LAUNCHER_NEW:
+ ask_about_launcher (NULL, dialog->panel_widget,
+ dialog->insert_pack_type);
+ break;
+ case PANEL_ADDTO_MENU:
+ panel_menu_button_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index,
+ item_info->menu_filename,
+ item_info->menu_path,
+ item_info->name);
+ break;
+ case PANEL_ADDTO_MENUBAR:
+ panel_menu_bar_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index);
+ break;
+ case PANEL_ADDTO_SEPARATOR:
+ panel_separator_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index);
+ break;
+ case PANEL_ADDTO_USER_MENU:
+ panel_user_menu_create (dialog->panel_widget->toplevel,
+ dialog->insert_pack_type,
+ pack_index);
+ break;
+ }
}
static void
panel_addto_dialog_button_add (PanelAddtoDialog *dialog,
GtkWidget *widget)
{
- GtkTreeSelection *selection;
- GtkTreeModel *filter_model;
- GtkTreeModel *child_model;
- GtkTreeIter iter;
- GtkTreeIter filter_iter;
-
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
- if (gtk_tree_selection_get_selected (selection, &filter_model,
- &filter_iter)) {
- PanelAddtoItemInfo *data;
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
-
&iter,
-
&filter_iter);
- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
- gtk_tree_model_get (child_model, &iter,
- COLUMN_DATA, &data, -1);
-
- if (data != NULL)
- panel_addto_add_item (dialog, data);
- }
+ GtkTreeSelection *selection;
+ GtkTreeModel *filter_model;
+ GtkTreeModel *child_model;
+ GtkTreeIter iter;
+ GtkTreeIter filter_iter;
+
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
+ if (gtk_tree_selection_get_selected (selection, &filter_model,
+ &filter_iter)) {
+ PanelAddtoItemInfo *data;
+
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
+ &iter,
+ &filter_iter);
+ child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ gtk_tree_model_get (child_model, &iter,
+ COLUMN_DATA, &data, -1);
+
+ if (data != NULL)
+ panel_addto_add_item (dialog, data);
+ }
}
/* This callback is only called when we're showing the
@@ -845,478 +847,478 @@ static void
panel_addto_dialog_button_back (PanelAddtoDialog *dialog,
GtkWidget *widget)
{
- panel_addto_present_applets (dialog);
+ panel_addto_present_applets (dialog);
}
static void
panel_addto_dialog_button_close (PanelAddtoDialog *dialog,
- GtkWidget *widget)
+ GtkWidget *widget)
{
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ gtk_widget_destroy (GTK_WIDGET (dialog));
}
static void
panel_addto_present_applications (PanelAddtoDialog *dialog)
{
- if (dialog->filter_application_model == NULL)
- panel_addto_make_application_model (dialog);
- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view),
- dialog->filter_application_model);
- gtk_window_set_focus (GTK_WINDOW (dialog),
- dialog->search_entry);
- gtk_widget_set_sensitive (dialog->button_back, TRUE);
-
- if (dialog->applet_search_text)
- g_free (dialog->applet_search_text);
-
- dialog->applet_search_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry)));
- /* show everything */
- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), "");
+ if (dialog->filter_application_model == NULL)
+ panel_addto_make_application_model (dialog);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view),
+ dialog->filter_application_model);
+ gtk_window_set_focus (GTK_WINDOW (dialog),
+ dialog->search_entry);
+ gtk_widget_set_sensitive (dialog->button_back, TRUE);
+
+ if (dialog->applet_search_text)
+ g_free (dialog->applet_search_text);
+
+ dialog->applet_search_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry)));
+ /* show everything */
+ gtk_entry_set_text (GTK_ENTRY (dialog->search_entry), "");
}
static void
panel_addto_present_applets (PanelAddtoDialog *dialog)
{
- if (dialog->filter_applet_model == NULL)
- panel_addto_make_applet_model (dialog);
- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view),
- dialog->filter_applet_model);
- gtk_window_set_focus (GTK_WINDOW (dialog),
- dialog->search_entry);
- gtk_widget_set_sensitive (dialog->button_back, FALSE);
-
- if (dialog->applet_search_text) {
- gtk_entry_set_text (GTK_ENTRY (dialog->search_entry),
- dialog->applet_search_text);
- gtk_editable_set_position (GTK_EDITABLE (dialog->search_entry),
- -1);
-
- g_free (dialog->applet_search_text);
- dialog->applet_search_text = NULL;
- }
+ if (dialog->filter_applet_model == NULL)
+ panel_addto_make_applet_model (dialog);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view),
+ dialog->filter_applet_model);
+ gtk_window_set_focus (GTK_WINDOW (dialog),
+ dialog->search_entry);
+ gtk_widget_set_sensitive (dialog->button_back, FALSE);
+
+ if (dialog->applet_search_text) {
+ gtk_entry_set_text (GTK_ENTRY (dialog->search_entry),
+ dialog->applet_search_text);
+ gtk_editable_set_position (GTK_EDITABLE (dialog->search_entry),
+ -1);
+
+ g_free (dialog->applet_search_text);
+ dialog->applet_search_text = NULL;
+ }
}
static void
panel_addto_dialog_free_item_info (PanelAddtoItemInfo *item_info)
{
- if (item_info == NULL)
- return;
+ if (item_info == NULL)
+ return;
- /* the GIcon is never static */
- g_clear_object (&item_info->icon);
+ /* the GIcon is never static */
+ g_clear_object (&item_info->icon);
- if (item_info->static_strings)
- return;
+ if (item_info->static_strings)
+ return;
- g_free (item_info->name);
- item_info->name = NULL;
+ g_free (item_info->name);
+ item_info->name = NULL;
- g_free (item_info->description);
- item_info->description = NULL;
+ g_free (item_info->description);
+ item_info->description = NULL;
- g_free (item_info->iid);
- item_info->iid = NULL;
+ g_free (item_info->iid);
+ item_info->iid = NULL;
- g_free (item_info->launcher_path);
- item_info->launcher_path = NULL;
+ g_free (item_info->launcher_path);
+ item_info->launcher_path = NULL;
- g_free (item_info->menu_filename);
- item_info->menu_filename = NULL;
+ g_free (item_info->menu_filename);
+ item_info->menu_filename = NULL;
- g_free (item_info->menu_path);
- item_info->menu_path = NULL;
+ g_free (item_info->menu_path);
+ item_info->menu_path = NULL;
}
static void
panel_addto_dialog_free_application_list (GSList *application_list)
{
- PanelAddtoAppList *data;
- GSList *app;
-
- if (application_list == NULL)
- return;
-
- for (app = application_list; app != NULL; app = app->next) {
- data = app->data;
- if (data->children) {
- panel_addto_dialog_free_application_list (data->children);
- }
- panel_addto_dialog_free_item_info (&data->item_info);
- g_free (data);
- }
- g_slist_free (application_list);
+ PanelAddtoAppList *data;
+ GSList *app;
+
+ if (application_list == NULL)
+ return;
+
+ for (app = application_list; app != NULL; app = app->next) {
+ data = app->data;
+ if (data->children) {
+ panel_addto_dialog_free_application_list (data->children);
+ }
+ panel_addto_dialog_free_item_info (&data->item_info);
+ g_free (data);
+ }
+ g_slist_free (application_list);
}
static void
panel_addto_name_change (PanelAddtoDialog *dialog)
{
- const char *name;
- char *label;
+ const char *name;
+ char *label;
- name = panel_toplevel_get_name (dialog->panel_widget->toplevel);
- label = NULL;
+ name = panel_toplevel_get_name (dialog->panel_widget->toplevel);
+ label = NULL;
- if (!PANEL_GLIB_STR_EMPTY (name))
- label = g_strdup_printf (_("Find an _item to add to \"%s\":"),
- name);
+ if (!PANEL_GLIB_STR_EMPTY (name))
+ label = g_strdup_printf (_("Find an _item to add to \"%s\":"),
+ name);
- if (label == NULL)
- label = g_strdup (_("Find an _item to add to the panel:"));
+ if (label == NULL)
+ label = g_strdup (_("Find an _item to add to the panel:"));
- gtk_label_set_text_with_mnemonic (GTK_LABEL (dialog->label), label);
- g_free (label);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (dialog->label), label);
+ g_free (label);
}
static void
-panel_addto_name_notify (GObject *gobject,
- GParamSpec *pspec,
- PanelAddtoDialog *dialog)
+panel_addto_name_notify (GObject *gobject,
+ GParamSpec *pspec,
+ PanelAddtoDialog *dialog)
{
- panel_addto_name_change (dialog);
+ panel_addto_name_change (dialog);
}
static gboolean
panel_addto_filter_func (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer userdata)
+ GtkTreeIter *iter,
+ gpointer userdata)
{
- PanelAddtoDialog *dialog;
- PanelAddtoItemInfo *data;
+ PanelAddtoDialog *dialog;
+ PanelAddtoItemInfo *data;
- dialog = (PanelAddtoDialog *) userdata;
+ dialog = (PanelAddtoDialog *) userdata;
- if (!dialog->search_text || !dialog->search_text[0])
- return TRUE;
+ if (!dialog->search_text || !dialog->search_text[0])
+ return TRUE;
- gtk_tree_model_get (model, iter, COLUMN_DATA, &data, -1);
+ gtk_tree_model_get (model, iter, COLUMN_DATA, &data, -1);
- if (data == NULL)
- return FALSE;
+ if (data == NULL)
+ return FALSE;
- /* This is more a workaround than anything else: show all the root
- * items in a tree store */
- if (GTK_IS_TREE_STORE (model) &&
- gtk_tree_store_iter_depth (GTK_TREE_STORE (model), iter) == 0)
- return TRUE;
+ /* This is more a workaround than anything else: show all the root
+ * items in a tree store */
+ if (GTK_IS_TREE_STORE (model) &&
+ gtk_tree_store_iter_depth (GTK_TREE_STORE (model), iter) == 0)
+ return TRUE;
- return (panel_g_utf8_strstrcase (data->name,
- dialog->search_text) != NULL ||
- panel_g_utf8_strstrcase (data->description,
- dialog->search_text) != NULL);
+ return (panel_g_utf8_strstrcase (data->name,
+ dialog->search_text) != NULL ||
+ panel_g_utf8_strstrcase (data->description,
+ dialog->search_text) != NULL);
}
static void
panel_addto_search_entry_changed (PanelAddtoDialog *dialog,
- GtkWidget *entry)
+ GtkWidget *entry)
{
- GtkTreeModel *model;
- char *new_text;
- GtkTreeIter iter;
- GtkTreePath *path;
-
- new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry)));
- g_strchomp (new_text);
-
- if (dialog->search_text &&
- g_utf8_collate (new_text, dialog->search_text) == 0) {
- g_free (new_text);
- return;
- }
-
- if (dialog->search_text)
- g_free (dialog->search_text);
- dialog->search_text = new_text;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
-
- path = gtk_tree_path_new_first ();
- if (gtk_tree_model_get_iter (model, &iter, path)) {
- GtkTreeSelection *selection;
-
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (dialog->tree_view),
- path, NULL, FALSE, 0, 0);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
- gtk_tree_selection_select_path (selection, path);
- }
- gtk_tree_path_free (path);
+ GtkTreeModel *model;
+ char *new_text;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+
+ new_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->search_entry)));
+ g_strchomp (new_text);
+
+ if (dialog->search_text &&
+ g_utf8_collate (new_text, dialog->search_text) == 0) {
+ g_free (new_text);
+ return;
+ }
+
+ if (dialog->search_text)
+ g_free (dialog->search_text);
+ dialog->search_text = new_text;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
+ path = gtk_tree_path_new_first ();
+ if (gtk_tree_model_get_iter (model, &iter, path)) {
+ GtkTreeSelection *selection;
+
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (dialog->tree_view),
+ path, NULL, FALSE, 0, 0);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_tree_selection_select_path (selection, path);
+ }
+ gtk_tree_path_free (path);
}
static void
panel_addto_search_entry_activated (PanelAddtoDialog *dialog,
- GtkWidget *entry)
+ GtkWidget *entry)
{
- panel_addto_dialog_button_add (dialog, entry);
+ panel_addto_dialog_button_add (dialog, entry);
}
static void
panel_addto_selection_changed (PanelAddtoDialog *dialog,
GtkTreeSelection *selection)
{
- GtkTreeModel *filter_model;
- GtkTreeModel *child_model;
- GtkTreeIter iter;
- GtkTreeIter filter_iter;
- PanelAddtoItemInfo *data;
- char *iid;
-
- if (!gtk_tree_selection_get_selected (selection,
- &filter_model,
- &filter_iter)) {
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add),
- FALSE);
- return;
- }
-
- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
- &iter, &filter_iter);
- child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
- gtk_tree_model_get (child_model, &iter, COLUMN_DATA, &data, -1);
-
- if (!data) {
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add),
- FALSE);
- return;
- }
-
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add), TRUE);
-
- if (data->type == PANEL_ADDTO_LAUNCHER_MENU) {
- gtk_button_set_label (GTK_BUTTON (dialog->button_add),
- _("_Forward"));
- } else {
- gtk_button_set_label (GTK_BUTTON (dialog->button_add),
- _("_Add"));
- }
-
- /* only allow dragging applets if we can add applets */
- if (panel_layout_is_writable ()) {
- switch (data->type) {
- case PANEL_ADDTO_LAUNCHER:
- panel_addto_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view),
- data->launcher_path);
- break;
- case PANEL_ADDTO_APPLET:
- panel_addto_setup_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
- data->iid);
- break;
- case PANEL_ADDTO_LAUNCHER_MENU:
- gtk_tree_view_unset_rows_drag_source (GTK_TREE_VIEW (dialog->tree_view));
- break;
- case PANEL_ADDTO_MENU:
- /* build the iid for menus other than the main menu */
- if (data->iid == NULL) {
- iid = g_strdup_printf ("MENU:%s/%s",
- data->menu_filename,
- data->menu_path);
- } else {
- iid = g_strdup (data->iid);
- }
- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
- iid);
- g_free (iid);
- break;
- default:
- panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
- data->iid);
- break;
- }
- }
+ GtkTreeModel *filter_model;
+ GtkTreeModel *child_model;
+ GtkTreeIter iter;
+ GtkTreeIter filter_iter;
+ PanelAddtoItemInfo *data;
+ char *iid;
+
+ if (!gtk_tree_selection_get_selected (selection,
+ &filter_model,
+ &filter_iter)) {
+ gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add),
+ FALSE);
+ return;
+ }
+
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (filter_model),
+ &iter, &filter_iter);
+ child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ gtk_tree_model_get (child_model, &iter, COLUMN_DATA, &data, -1);
+
+ if (!data) {
+ gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add),
+ FALSE);
+ return;
+ }
+
+ gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_add), TRUE);
+
+ if (data->type == PANEL_ADDTO_LAUNCHER_MENU) {
+ gtk_button_set_label (GTK_BUTTON (dialog->button_add),
+ _("_Forward"));
+ } else {
+ gtk_button_set_label (GTK_BUTTON (dialog->button_add),
+ _("_Add"));
+ }
+
+ /* only allow dragging applets if we can add applets */
+ if (panel_layout_is_writable ()) {
+ switch (data->type) {
+ case PANEL_ADDTO_LAUNCHER:
+ panel_addto_setup_launcher_drag (GTK_TREE_VIEW (dialog->tree_view),
+ data->launcher_path);
+ break;
+ case PANEL_ADDTO_APPLET:
+ panel_addto_setup_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
+ data->iid);
+ break;
+ case PANEL_ADDTO_LAUNCHER_MENU:
+ gtk_tree_view_unset_rows_drag_source (GTK_TREE_VIEW (dialog->tree_view));
+ break;
+ case PANEL_ADDTO_MENU:
+ /* build the iid for menus other than the main menu */
+ if (data->iid == NULL) {
+ iid = g_strdup_printf ("MENU:%s/%s",
+ data->menu_filename,
+ data->menu_path);
+ } else {
+ iid = g_strdup (data->iid);
+ }
+ panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
+ iid);
+ g_free (iid);
+ break;
+ default:
+ panel_addto_setup_internal_applet_drag (GTK_TREE_VIEW (dialog->tree_view),
+ data->iid);
+ break;
+ }
+ }
}
static void
-panel_addto_selection_activated (PanelAddtoDialog *dialog,
- GtkTreeView *view,
- GtkTreePath *path,
+panel_addto_selection_activated (PanelAddtoDialog *dialog,
+ GtkTreeView *view,
+ GtkTreePath *path,
GtkTreeViewColumn *column)
{
- panel_addto_dialog_button_add (dialog, dialog->button_add);
+ panel_addto_dialog_button_add (dialog, dialog->button_add);
}
static gboolean
panel_addto_separator_func (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
+ GtkTreeIter *iter,
+ gpointer data)
{
- int column = GPOINTER_TO_INT (data);
- char *text;
-
- gtk_tree_model_get (model, iter, column, &text, -1);
-
- if (!text)
- return TRUE;
-
- g_free(text);
- return FALSE;
+ int column = GPOINTER_TO_INT (data);
+ char *text;
+
+ gtk_tree_model_get (model, iter, column, &text, -1);
+
+ if (!text)
+ return TRUE;
+
+ g_free (text);
+ return FALSE;
}
static PanelAddtoDialog *
panel_addto_dialog_new (PanelWidget *panel_widget)
{
- PanelAddtoDialog *dialog;
+ PanelAddtoDialog *dialog;
- dialog = g_object_new (PANEL_TYPE_ADDTO_DIALOG, NULL);
+ dialog = g_object_new (PANEL_TYPE_ADDTO_DIALOG, NULL);
- g_object_set_qdata (G_OBJECT (panel_widget->toplevel),
- panel_addto_dialog_quark,
- dialog);
+ g_object_set_qdata (G_OBJECT (panel_widget->toplevel),
+ panel_addto_dialog_quark,
+ dialog);
- dialog->panel_widget = panel_widget;
+ dialog->panel_widget = panel_widget;
- g_signal_connect_object (dialog->panel_widget->toplevel,
- "notify::name",
- G_CALLBACK (panel_addto_name_notify),
- dialog,
- 0);
+ g_signal_connect_object (dialog->panel_widget->toplevel,
+ "notify::name",
+ G_CALLBACK (panel_addto_name_notify),
+ dialog,
+ 0);
- gtk_widget_show_all (dialog->dialog_vbox);
+ gtk_widget_show_all (dialog->dialog_vbox);
- panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel);
- panel_widget_register_open_dialog (panel_widget,
- GTK_WIDGET (dialog));
+ panel_toplevel_push_autohide_disabler (dialog->panel_widget->toplevel);
+ panel_widget_register_open_dialog (panel_widget,
+ GTK_WIDGET (dialog));
- panel_addto_name_change (dialog);
+ panel_addto_name_change (dialog);
- return dialog;
+ return dialog;
}
static void
panel_addto_dialog_constructed (GObject *object)
{
- G_OBJECT_CLASS (panel_addto_dialog_parent_class)->constructed (object);
- PanelAddtoDialog *dialog = PANEL_ADDTO_DIALOG (object);
+ G_OBJECT_CLASS (panel_addto_dialog_parent_class)->constructed (object);
+ PanelAddtoDialog *dialog = PANEL_ADDTO_DIALOG (object);
- /*FIXME use the same search than the one for the search entry? */
- gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view),
- COLUMN_SEARCH);
+ /*FIXME use the same search than the one for the search entry? */
+ gtk_tree_view_set_search_column (GTK_TREE_VIEW (dialog->tree_view),
+ COLUMN_SEARCH);
- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view),
- panel_addto_separator_func,
- GINT_TO_POINTER (COLUMN_TEXT),
- NULL);
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (dialog->tree_view),
+ panel_addto_separator_func,
+ GINT_TO_POINTER (COLUMN_TEXT),
+ NULL);
}
static void
panel_addto_dialog_dispose (GObject *object)
{
- PanelAddtoDialog *dialog;
+ PanelAddtoDialog *dialog;
- dialog = PANEL_ADDTO_DIALOG (object);
+ dialog = PANEL_ADDTO_DIALOG (object);
- g_clear_object (&dialog->filter_applet_model);
- g_clear_object (&dialog->applet_model);
- g_clear_object (&dialog->filter_application_model);
- g_clear_object (&dialog->application_model);
- g_clear_object (&dialog->menu_tree);
+ g_clear_object (&dialog->filter_applet_model);
+ g_clear_object (&dialog->applet_model);
+ g_clear_object (&dialog->filter_application_model);
+ g_clear_object (&dialog->application_model);
+ g_clear_object (&dialog->menu_tree);
- G_OBJECT_CLASS (panel_addto_dialog_parent_class)->dispose (object);
+ G_OBJECT_CLASS (panel_addto_dialog_parent_class)->dispose (object);
}
static void
panel_addto_dialog_finalize (GObject *object)
{
- PanelAddtoDialog *dialog;
- GSList *item;
+ PanelAddtoDialog *dialog;
+ GSList *item;
- dialog = PANEL_ADDTO_DIALOG (object);
+ dialog = PANEL_ADDTO_DIALOG (object);
- panel_toplevel_pop_autohide_disabler (PANEL_TOPLEVEL (dialog->panel_widget->toplevel));
- g_object_set_qdata (G_OBJECT (dialog->panel_widget->toplevel),
- panel_addto_dialog_quark,
- NULL);
+ panel_toplevel_pop_autohide_disabler (PANEL_TOPLEVEL (dialog->panel_widget->toplevel));
+ g_object_set_qdata (G_OBJECT (dialog->panel_widget->toplevel),
+ panel_addto_dialog_quark,
+ NULL);
- g_free (dialog->search_text);
- dialog->search_text = NULL;
+ g_free (dialog->search_text);
+ dialog->search_text = NULL;
- g_free (dialog->applet_search_text);
- dialog->applet_search_text = NULL;
+ g_free (dialog->applet_search_text);
+ dialog->applet_search_text = NULL;
- for (item = dialog->applet_list; item != NULL; item = item->next) {
- PanelAddtoItemInfo *applet;
+ for (item = dialog->applet_list; item != NULL; item = item->next) {
+ PanelAddtoItemInfo *applet;
- applet = (PanelAddtoItemInfo *) item->data;
- panel_addto_dialog_free_item_info (applet);
- g_free (applet);
- }
- g_slist_free (dialog->applet_list);
+ applet = (PanelAddtoItemInfo *) item->data;
+ panel_addto_dialog_free_item_info (applet);
+ g_free (applet);
+ }
+ g_slist_free (dialog->applet_list);
- panel_addto_dialog_free_application_list (dialog->application_list);
- panel_addto_dialog_free_application_list (dialog->settings_list);
+ panel_addto_dialog_free_application_list (dialog->application_list);
+ panel_addto_dialog_free_application_list (dialog->settings_list);
- G_OBJECT_CLASS (panel_addto_dialog_parent_class)->finalize (object);
+ G_OBJECT_CLASS (panel_addto_dialog_parent_class)->finalize (object);
}
static void
panel_addto_dialog_class_init (PanelAddtoDialogClass *dialog_class)
{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (dialog_class);
- GObjectClass *object_class = G_OBJECT_CLASS (dialog_class);
-
- object_class->constructed = panel_addto_dialog_constructed;
- object_class->dispose = panel_addto_dialog_dispose;
- object_class->finalize = panel_addto_dialog_finalize;
-
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/panel/panel-add-to-dialog.ui");
-
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, dialog_vbox);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, label);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, search_entry);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_add);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_back);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_close);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, tree_view);
- gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, tree_view_selection);
-
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_add);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_back);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_close);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_search_entry_changed);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_search_entry_activated);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_selection_changed);
- gtk_widget_class_bind_template_callback (widget_class, panel_addto_selection_activated);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (dialog_class);
+ GObjectClass *object_class = G_OBJECT_CLASS (dialog_class);
+
+ object_class->constructed = panel_addto_dialog_constructed;
+ object_class->dispose = panel_addto_dialog_dispose;
+ object_class->finalize = panel_addto_dialog_finalize;
+
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/panel/panel-add-to-dialog.ui");
+
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, dialog_vbox);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, label);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, search_entry);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_add);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_back);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, button_close);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, tree_view);
+ gtk_widget_class_bind_template_child (widget_class, PanelAddtoDialog, tree_view_selection);
+
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_add);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_back);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_dialog_button_close);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_search_entry_changed);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_search_entry_activated);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_selection_changed);
+ gtk_widget_class_bind_template_callback (widget_class, panel_addto_selection_activated);
}
static void
panel_addto_dialog_init (PanelAddtoDialog *dialog)
{
- gtk_widget_init_template (GTK_WIDGET (dialog));
+ gtk_widget_init_template (GTK_WIDGET (dialog));
}
#define MAX_ADDTOPANEL_HEIGHT 490
void
panel_addto_present (GtkMenuItem *item,
- PanelWidget *panel_widget)
+ PanelWidget *panel_widget)
{
- PanelAddtoDialog *dialog;
- PanelToplevel *toplevel;
- PanelData *pd;
- GdkScreen *screen;
- gint screen_height;
- gint height;
-
- toplevel = panel_widget->toplevel;
- pd = g_object_get_data (G_OBJECT (toplevel), "PanelData");
-
- if (!panel_addto_dialog_quark)
- panel_addto_dialog_quark =
- g_quark_from_static_string ("panel-addto-dialog");
-
- dialog = g_object_get_qdata (G_OBJECT (toplevel),
- panel_addto_dialog_quark);
-
- screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
- screen_height = gdk_screen_get_height (screen);
- height = MIN (MAX_ADDTOPANEL_HEIGHT, 3 * (screen_height / 4));
-
- if (!dialog) {
- dialog = panel_addto_dialog_new (panel_widget);
- panel_addto_present_applets (dialog);
- }
-
- dialog->insert_pack_type = pd ? pd->insert_pack_type : PANEL_OBJECT_PACK_START;
- gtk_window_set_screen (GTK_WINDOW (dialog), screen);
- gtk_window_set_default_size (GTK_WINDOW (dialog),
- height * 8 / 7, height);
- gtk_window_present (GTK_WINDOW (dialog));
+ PanelAddtoDialog *dialog;
+ PanelToplevel *toplevel;
+ PanelData *pd;
+ GdkScreen *screen;
+ gint screen_height;
+ gint height;
+
+ toplevel = panel_widget->toplevel;
+ pd = g_object_get_data (G_OBJECT (toplevel), "PanelData");
+
+ if (!panel_addto_dialog_quark)
+ panel_addto_dialog_quark =
+ g_quark_from_static_string ("panel-addto-dialog");
+
+ dialog = g_object_get_qdata (G_OBJECT (toplevel),
+ panel_addto_dialog_quark);
+
+ screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
+ screen_height = gdk_screen_get_height (screen);
+ height = MIN (MAX_ADDTOPANEL_HEIGHT, 3 * (screen_height / 4));
+
+ if (!dialog) {
+ dialog = panel_addto_dialog_new (panel_widget);
+ panel_addto_present_applets (dialog);
+ }
+
+ dialog->insert_pack_type = pd ? pd->insert_pack_type : PANEL_OBJECT_PACK_START;
+ gtk_window_set_screen (GTK_WINDOW (dialog), screen);
+ gtk_window_set_default_size (GTK_WINDOW (dialog),
+ height * 8 / 7, height);
+ gtk_window_present (GTK_WINDOW (dialog));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
