Rename lxpanel_button_new_for_icon2() into lxpanel_button_new_for_fm_icon()
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 11:27:47 +0000 (13:27 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 11:27:47 +0000 (13:27 +0200)
src/misc.c
src/misc.h
src/plugins/launchbar.c

index 58536af..0ac86e9 100644 (file)
@@ -1155,7 +1155,7 @@ GtkWidget *lxpanel_button_new_for_icon(Panel *panel, const gchar *name, GdkColor
                                         panel->icon_size, highlight_color, label);
 }
 
-GtkWidget *lxpanel_button_new_for_icon2(Panel *panel, FmIcon *icon, GdkColor *color, gchar *label)
+GtkWidget *lxpanel_button_new_for_fm_icon(Panel *panel, FmIcon *icon, GdkColor *color, gchar *label)
 {
     gulong highlight_color = color ? gcolor2rgb24(color) : PANEL_ICON_HIGHLIGHT;
     return _lxpanel_button_new_for_icon(panel, g_object_ref(icon),
index 8d9b371..c0a139b 100644 (file)
@@ -78,7 +78,7 @@ gchar *expand_tilda(const gchar *file);
 void get_button_spacing(GtkRequisition *req, GtkContainer *parent, gchar *name);
 guint32 gcolor2rgb24(GdkColor *color);
 GtkWidget *lxpanel_button_new_for_icon(Panel *panel, const gchar *name, GdkColor *color, gchar *label);
-GtkWidget *lxpanel_button_new_for_icon2(Panel *panel, FmIcon *icon, GdkColor *color, gchar *label);
+GtkWidget *lxpanel_button_new_for_fm_icon(Panel *panel, FmIcon *icon, GdkColor *color, gchar *label);
 void lxpanel_button_set_icon(GtkWidget* btn, const gchar *name, gint size);
 void lxpanel_button_set_icon2(GtkWidget* btn, FmIcon *icon, gint size);
 
index 218c972..b50f529 100644 (file)
@@ -276,8 +276,8 @@ static LaunchButton *launchbutton_build_gui(LaunchbarPlugin * lb, FmPath * id)
     btn->fi = fi;
 
     /* Create a button with the specified icon. */
-    button = lxpanel_button_new_for_icon2(lb->panel, fm_file_info_get_icon(fi),
-                                          NULL, NULL);
+    button = lxpanel_button_new_for_fm_icon(lb->panel, fm_file_info_get_icon(fi),
+                                            NULL, NULL);
     btn->widget = button;
 #if GLIB_CHECK_VERSION(2,18,0)
      gtk_widget_set_can_focus(button, FALSE);